projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97431b7
)
(prepare_menu_bars): Don't call
author
Martin Rudalics
<rudalics@gmx.at>
Sun, 31 Aug 2008 08:27:25 +0000
(08:27 +0000)
committer
Martin Rudalics
<rudalics@gmx.at>
Sun, 31 Aug 2008 08:27:25 +0000
(08:27 +0000)
Vwindow_size_change_functions with arg Qt.
src/xdisp.c
patch
|
blob
|
history
diff --git
a/src/xdisp.c
b/src/xdisp.c
index 3f73391c0aab7eaef5cd1c9f95ce744c8aca022c..9e351b5c47da7ff492a089fbbf1bf8a2c99afca8 100644
(file)
--- a/
src/xdisp.c
+++ b/
src/xdisp.c
@@
-5920,7
+5920,7
@@
get_next_display_element (it)
{
/* Automatic composition with glyph-string. */
Lisp_Object gstring = composition_gstring_from_id (it->cmp_it.id);
-
+
it->face_id = face_for_font (it->f, LGSTRING_FONT (gstring), face);
}
else
@@
-9523,7
+9523,8
@@
prepare_menu_bars ()
while (CONSP (functions))
{
- call1 (XCAR (functions), frame);
+ if (!EQ (XCAR (functions), Qt))
+ call1 (XCAR (functions), frame);
functions = XCDR (functions);
}
UNGCPRO;